Fix command entry points