Fixed issues that Ryan fixed on the main repo