A few small changes through the Ref Block Spilt stack

Small fixes while looking for improvements for #359