Merge some proposed fixes