Just applied quick fixes to enable build