minor cleanup / some warning fixes