2.07.2:Foffy123:51 Minor defines fixes