Allow better code loading
Fix the args handling