Minor fixes, necessary before the employments work