Build partial fix