Squashed commit of the following:

commit 07ee15cc9f25d8b0c89cfc67388bef50ac0eec9f
Author: Rachman Chavik <rchavik@xintesa.com>
Date:   Fri May 24 18:04:36 2013 +0700

    CS Fixes

commit b6ea61a1aefd585f9f2f61d7884209603e0c4756
Author: Rachman Chavik <rchavik@xintesa.com>
Date:   Fri May 10 12:09:04 2013 +0700

    CS Fixes

commit d3bc56d688b32bbb48fc4590cf6f85d8ab625b70
Author: Rachman Chavik <rchavik@xintesa.com>
Date:   Sat May 4 20:14:37 2013 +0700

    CS Fixes