Fixed issues pointed out by Ms2ger and larsberg