Multiple bug fixes
Merge with master