Minor fixes and max memory increase