More manual implementation bugfixes.