Fixed what could be fixed easily