Merged fixes