Bundle fixes