Fixed defines in system