Fix problems found in code review ;)