Some more bugs