Fixin moar stuff