Fixed some issues...