Feature/clean compiler warnings