KRL related fixes