Bat fixes, etc.