Fix lil' mistakes from the first commit