A few small improvements to remove smells and warnings