Removed weak type declarations, fix #7