Make classes more fluent and fix build