Fixes for #3567 & #3568