Fixes for bugs found during deployment