Some pass change fixes