superdev mode fixes