fixes for outstanding issues