Fixes the stuff I've been yapping about in #3