Fixes for windows - inheritance