Update Minor bug fixes