some fixes to make it work