Some bug fixes.
Removing exit status.