Couple of bugs (FZ35)