Multiple fixes as requested