Starting bug fixes on alf client