Minor fixes in decoration