Fixed things for Lunatrius