Fix some issues
Fix some other issues