Actually various fixes