Fixed minor (but annoying) spec bugs