Some hopefully fixed behind the scenes