Making some changes to help in basic dev and prod development.