Fixed a few thing that should work after merging