Some slight bug tweaks.