Minor engine updates