More Fixes

Signed-off-by: aways <aways@c-rom.org>