Fixed errors and warnings (see comment inside .xml file, line 216)