Public Domain; Fixed some types