Fixing bugs with xi:includes