Few additional fixes