fixes for native commands