Small fixes here and there

Signed-off-by: michel.topuzoglu <michel.topuzoglu@gmail.com>