Some more improvements in the coders