Little bug fixes;