Fixes for 7th issue