Patch #4 - Small Fixes