3.0/develop

Small fixes