Fixes Build

Updates build with new changes in src.