Closed various issues