Engine API changes, several fixes