This should fix a few bugs