some smaller fixes