Fixed some issues with commands