Some fixes

Fix #2