Patch of fixes for bugs and oversights

My bad, it was supposed to be src, forgot to change it.