Fixes to make everything work