fixes and hacks