looks like I'm again through @aghosn's bug list

/cc @aghosn