- Attempt various bug fixes