Several console storage related fixes