Fixes to load commands from files