Yanic#265 Various fixes