Fixes

Github conflict fixes