Merged branches manually
More fixes