Small design bugfixes