more fixes for issue #2, HD4000 specific