Add support for 2 executables and minor bugfix