Fixed issues hopefully