More fixes =)