Sync up ServiceStack for build fixes