Various fixes

Not pushing directly because of OSCON.