Fixes for 9780, 9840