Small bugfixes and new opk