Fixed stuff for deployment