- Fixed various minor issues