Bug fixes/additions