Fixing opatut's bugs.