Small changes to main patcher