Some more bluestone fixes :D