Added in some extra parens to supress some compiler warnings