Couple small project changes thanks to Dorian Puła