Pushed from deployment server: Fixing mior bugs