Merged some changes from fixmyhelsinki branch