Fixed some Maybe flaws