Some more bug hunting