Post test #2 bugfixes