my fixes for 2.1.1 src build