More bug tweaks.