Fixes all around