Misc bugfixes and category adjustments.