Some small changes so I can continue on another PC