Fixes for Resource servlet and Protobuf mapper