Bugfixes after testing using pyfrc