Small fixes before contract revamp