Nits and bolts

Clearing up some devtools errors here and there, but mostly nits (hence the horrible pun).