Fixes as requested