Fixing more stuffs