Small bug fixes, again