Fixed merge w/ keep_lower, some other stuff