Fixes issues across servers

Noticed some shorttags were used which caused problems on our server.