Bug fixes, convenience methods.