Made fixes as requested.