Small important bug fixes to handful of components

Signed-off-by: Aaron Rosenzweig <aaron@chatnbike.com>