ADD - Some bug fixes