Source fixes