Bug fixes for swTable