Fixed more alpha issues