some quick fixes to make it work