Attempting to fix some stuff