Miscelaneous spec and fake improvements