Fixing build proccess