Try Squeak Ender II to get rid of annoying floor squeaks. Squeak Ender will pull sub-floor back tight against joist, making that floor squeak go away.

SoftWax filler system by FastCap takes care of filling nail holes, dings, deep scratches, nicks, etc. in your wood or laminate flooring. Sold individually, the SoftWax filler system comes in 20 different colors to choose from, making matching much easier to do.