20141119 - Fixed serialilzer issues