fixes found while running