[#4785] Fixes for changes from [#4637]
Signed-off-by: Cory Johns johnsca@geek.net
Authored by: Cory Johns 2012-10-02
Parent(s): [473db3]
Child(ren): [d48f26]