misc fixes for different scenarios