quick fixes before tagging