Program fixes