Added a couple of define()s