mostly merge related fixes