Minor bug fixes and features.