More fixes to make @itsmenathan happier