[Buildable] Some fixes