Fixed some issues with the resource declarations.