Delegate style fixes