Minor fixes (made it work again).