Some dev mode fixes