Fixed issues pointed out by Josh