ACIIIIIIIIIIIIIIID: Patch #1

Minor bug fixes