fixes from alex