more one liner fixes