Fix Merge Issues

Had problems with the merging of the two branches on GitHub, so we had
to ham fist it this way.