Fixes to make fully b/c with current Joomla implementation