Argument entry fix
magic.h place fix