Final minus fixes