Fixed some more issues with the A object