4.7.1

Small fixes