Fixed all build errors in decode