More inline fixes