Fixed up random issues