Fixes for win, inheritance and lint