Miscellaneous bug fixes
Standardizing target API versions
Merge pull request #560 from bhariharan/unstable

Miscellaneous bug fixes