More fixes to dependency properties generator