Very small design fixes

Signed-off-by: Orangescrum <developer@orangescrum.com>