Fixing a few issues found on the dev server