Fixes as suggested.