Niggly fixes