Closing some API Related Bugs

Close:
Bug #379
Bug #380
Bug #381