fixes for deployment purposes