Fixes to make it work