Fixed things caused by enum changes