More noise work
Got rid of some compiler errors