Some final tweeaks