Small fixes as requested

Small fixes as requested