fix issues with keys/sources