Alex - more bug fixes