Fixes and commands