Fixes for 3955 and 10187