Fixes to make it actually work