Core stability bug fixes

http://jira.webinos.org/browse/WP-1264