Minor modifications to stuffs