cleanup / fix compile