Small bug fixes, again and again