Various fixes from long term usage and on-site changes