cleanup / fix compilation issues