Small fixes and Array