Fixes bugs in bundle command