Fix some things that will cause confusion