Added memory overrides, and various inlines