Minor Changes to Engine