some for fixes