Fixes
(cherry picked from commit 8c55569)