Minor fixes, removed empty ctors.