Bugfixes 'n' stuff.