update to crespo fixes

Change-Id: I26ecb794697843be7878afb30be9fe7eaabfaa5d