Giraffe: Bug Fixes

First bug fixes patch