Fixes for issue crewmate/crewmate#92