Some minor fixes and changes