Fixes and cosmetics.