Address fixes in contracts