Fixed all spec failures \o/