fixups
add stubs