Fixed issues that were created with previous upload