Engine fixes