Minor cleanup, dealing with executable issues.