Wee, more bug fixes