Fixes a few small issues with 13.10.