A bunch of fixes; remove default location in bite code entry map