Fixes instance errors, removes bad aliases