Modified a couple #ifdef USERPROG/#endifs