Minor modifications to the code base