Fix target types