Code

Merge 'fixes' branch.