Fixed the order of types to make static construction work
Added just enough BCL to allow Calca to load