Engine improvements - fixed