Several fixes an improvements