Giant fixes