Minor fixes
Minor fixes


Former-commit-id: 844b9f2c29557c5f7670e15eb4c2fd36296179cb [formerly 535a5c9dc023036c7275e3e840329e5bd37dad8e]
Former-commit-id: 36e2d626ebccc11da100f62e9e770589f6d32065
darkbuck/Halide,Trass3r/Halide,Trass3r/Halide,Trass3r/Halide,Trass3r/Halide,Trass3r/Halide,darkbuck/Halide,darkbuck/Halide,darkbuck/Halide,Trass3r/Halide,darkbuck/Halide,darkbuck/Halide,darkbuck/Halide,Trass3r/Halide