Update build with bug fixes