More fixed issues pointed out by Ms2ger