applied fixes from the future branch