Fixes

Let's get this into `master`!