More rough stubs and fixes