Fixes for dodgy branch