Fixed issues, another test commit