Fix up some newcastle stuff