Fix unimplemented things after refactor (crash fix)