fixes for pr