Fixes, code revisions.