Fixes and Updates all around