add additional encoding for atmost
fix warnings