Оbvious fixes from scholer's fork