Fixes

Some tweaks to be able to run the site flawlessly