Fixed immediate issues