Fixes for a number of little bugs that occurred in different production instances