Fixed some @preconditions