Fix some issues I looked over