Fixed Make File issues