misc fixes

Signed-off-by: frap129 <frap129@gmail.com>