Bug fixes, compatibility with Views 1.3