Bug/minor fixes after deploy