Committing stub fixes