Branch 1 0

Fixes