Merge a few more fixes