[^] more fixes