Fix (core); Small changed decorators