bug fixes for deployment on server'