Fixing moar stuff