Fixed bakabuild script to reflect recent changes