Small changes to engine