Fixes to new parameter-less contexts in base classes