Minor fixes to the custom commands