Fix various minor issues that Daniel Mewes pointed out.
Fix some style checker issues.