Fix NAL building