Some fixes to the montage PR

This is the first time I'm attempting something like this. A PR for a PR...