Fix Google warning and make set current page