Small important bug fixes to handful of components

Signed-off-by: Aaron Rosenzweig <aaron@chatnbike.com>
Merge pull request #374 from recurve/HandfulComponentFixes

Small important bug fixes to handful of components