Fixing several things