Small bugfixes after watching solutions