Fix compilation issues introduced by moving stuff