Fixes for invalid commands and signals