Small improvements

These two commits fix problems on my platform