Squashed commit: Merge fixes

Underp

Underp #2