Optimize page load
Small 1.5 compatibility things