addressing a number of compile issues