Fixes to get it working