Actually fix compile

(sorry about the multitude of commits)