Fixes for handling legacy commands