Fix several very minor consistency issues Upstream-commit: ae1d3d6d6851c2721bae94f0c7c0c0af9b866392 Component: engine