Fixes1

Pretty please pull in my PR.