fixes from stable release