Minor changes (Not quite stable)
(cherry picked from commit d07d7ff)