Bug fixes
Merge commit 'bc46b05'