Fixed some constants stuff