BomjKolyadun's Fixes