Fixes to get it working again