more fixes due to differences from modules master to release