Fixed shared methods and minor other things