Fixes to mockprograms