Resolve a number of rendering warnings