Project cleanup, small fixes

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