Small fixes and cosmetics.