Stupid pointer errors on refactoring