Fixed issues pointed out by Ms2ger