Sources fixes