Fixes for #4106 & #4108

I fixed things!