Fix errors to build with Luna and Sirius 1.0.0