Channel fixes

Found a couple more instances where in.channels() should be used
instead of head.channels()
Merge branch 'master' into 32bit