Minor changes to eliminate pesky application usage bugs that could occur.