Fixes for 8078