Pass bugfixes