minor fixes for building