Add small fixes
Compiled 08-01-2014 2