Minor fixes to the last deployment