Fix miscellenious things