Fixed built-in commands