Fixes and clean ups.