Minor structural fixes.

Signed-off-by: martingronlund <martingronlund@live.se>