manually bootstrapping some new classes
fix compile errors