Fix for some stuff