Minor enchacements