Fixed a couple of bugs when not using data bags