Fix things pointed out by @nakajima