Some Generic Fixes