Both issues are pretty easy to fix, fortunatley.