More bug bixes