Fix command hooks