Bugfixes for reinforce