Fix several small issues found in recent deploy