Thor 0.19 and spec fix