Fix some warning + add memory storage skeleton