Make stuff compile again