68355394 needs - small fixes