some hacks and fixes