fixes, ongoing