Core: More stuff I missed