Fixed issues that Jacob introduced