Fixing interfaces and enums nullpointer