Fixes committed, commit 97324ac5d2321f7596a4eed03a16fee8673c204a and d7692d128f85d3efab12d446e5592394a7773eab
Fixes committed, commit 97324ac5d2321f7 596a4eed03a16fe e8673c204a and d7692d128f85d3e fab12d446e55923 94a7773eab