Fixes for including constructors