Fix commands hopefully