Fixed some decorator problems.