Resolve various warnings