Applied patches suggested by etu