Minor fixes to appease Weazzy