Add empty command handlers and fix build