WFK2-824 and WFK2-825

Contains fixes for multiple issues. Please do not squash into a single commit.