some fixed for 4.1 compatability