fixes for 2nd build