More fixes for compilation errors

No longer need a modded display-caf