Fixes to make things actually work