Rest Resource fixes