Static methods and fixes