fixups for badly applied patch

When I applied the pull requests from Github something was b0rked.

This fixes it.