Fixing other issues