Implemented minor bug fixes.