Cleanup some strict standards issues. Fix size saving