Some changes for castlewindsor