Fixes and Updates