Some fixes, mainly org support functions.