Dev commit: Small stuff needed for work on another computer