Several fixes for methods with target parameters