Fixed some issues that were pointed out.