Guard resource new specs and spec fixes