Fixed other minor bug