Fix more errors and get specs passing