"Fixed" some stuff