Fixed issues with EJS