Updates for Kohana 3.3 compatibility