Minor stuff needed for deployment