Fixing a few stuff