More minor fixes (From aland)
Should fail if attribute doesn't exist...