fixing make and compilation issues