Fixes for compile (Me sleepy)