Few small changes to just Davify the code.