Fixed issues noted by user