#7 merge fixes