Fixed issues with schemes and targets