Small fixes from the new OS