fixes for enum changes