minor fixes for develop branch