Additional fixes and features.