Minor changes according to phpbb coning requirements