Minfor fixes and depricated code
Minor stuff