**Attempts** at bug fixes