Re-added some parantheses where stuff was broken