Small changes made while fixing #10