The Great FE Refactor part 6
Fix some more commands