Various design fixes

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>