Little fix to XML decoder
Working on component stuff