Address unit enabling issues

Fix #71
 
Fix #69