Maybe fix some stuff