Some fixes on targetting