Some minor fixes after checking live