Minor embedded bitmap fix, improvement to -rebuild script