Wrapper fixes, Rules and Router