Basic classes stubs and fixes