Fixed source location issues