Fixed some issues with immutables