Simple fixes and implementations.