Fix Some things