Small fixes and Joomla 2.5 improvements