Bugs fixed for iPhone4