Hal fixes!