Fix some issues...