Fix for code signing and executiion mode regression