Fixing some merge issues, hopefully
Fixing issues...