Make the decorators proper