Compatch: added new defines and static modifiers