Some fixes after v1 went live