Lastest round of bugs