Cleaned up warnings from enum size mismatches